Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Jan 2011 22:40:44 +0000 (14:40 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Jan 2011 22:40:44 +0000 (14:40 -0800)

Trivial merge